Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 5 Apr 2010 10:14:31 +0000 (10:14 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 5 Apr 2010 10:14:31 +0000 (10:14 +0000)

Trivial merge